Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 4 Jul 2011 17:41:05 +0000 (10:41 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 4 Jul 2011 17:41:05 +0000 (10:41 -0700)
commitacf5f7fd1dcb809b74063bd06abd9111fd3171e0
tree4f26f5bfc711dd6c4e0eaa76721247a78119b888
parent0db929998fc667dcf75e95e7d97a1c3392401133
parent521c01f683c7dfa3557101b56ec7777c7d2e605c
Merge from trunk.